Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 14 May 2010 11:34:53 +0000 (11:34 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 14 May 2010 11:34:53 +0000 (11:34 +0000)
commitcc2a65b68b708658fb32c181169ba7bbb09cb1a7
treed13f60117aa975e792e63706013e82d7f110adb8
parentcf504c833ee1c0c403e32839f85105311b5ad81e
parent7cb00303bf694185e52e96186bfeee77f528e7c3
Merge from mainline.